From edaa41829b989a974a8284bcf49c0ffa5aa626a7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 27 Jan 2004 00:49:46 +0000 Subject: [PATCH] Removed conflict markers. --- ChangeLog | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 5 files changed, 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc6cf7189e..e1d6658d3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -173,7 +173,6 @@ Thu Jan 22 18:45:26 2004 Owen Taylor * NEWS: Organized, added some names. ->>>>>>> 1.4833 Thu Jan 22 16:59:36 2004 Jonathan Blandford * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cc6cf7189e..e1d6658d3b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -173,7 +173,6 @@ Thu Jan 22 18:45:26 2004 Owen Taylor * NEWS: Organized, added some names. ->>>>>>> 1.4833 Thu Jan 22 16:59:36 2004 Jonathan Blandford * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cc6cf7189e..e1d6658d3b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -173,7 +173,6 @@ Thu Jan 22 18:45:26 2004 Owen Taylor * NEWS: Organized, added some names. ->>>>>>> 1.4833 Thu Jan 22 16:59:36 2004 Jonathan Blandford * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cc6cf7189e..e1d6658d3b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -173,7 +173,6 @@ Thu Jan 22 18:45:26 2004 Owen Taylor * NEWS: Organized, added some names. ->>>>>>> 1.4833 Thu Jan 22 16:59:36 2004 Jonathan Blandford * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cc6cf7189e..e1d6658d3b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -173,7 +173,6 @@ Thu Jan 22 18:45:26 2004 Owen Taylor * NEWS: Organized, added some names. ->>>>>>> 1.4833 Thu Jan 22 16:59:36 2004 Jonathan Blandford * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix. -- 2.30.2